Release 2018.5

Lots of stuff queued up.

Closes: #1585
Approved by: jlebon

diff --git a/configure.ac b/configure.ac
index 6c7a8b5c5a2f9af6fb7a26a6ed7dd07837a09a41..afedc030d4c4a3f2d71e79fcd1e70dac4d034a40 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -7,7 +7,7 @@ m4_define([year_version], [2018])
 m4_define([release_version], [5])
 m4_define([package_version], [year_version.release_version])
 AC_INIT([libostree], [package_version], [walters@verbum.org])
-is_release_build=no
+is_release_build=yes
 AC_CONFIG_HEADER([config.h])
 AC_CONFIG_MACRO_DIR([buildutil])
 AC_CONFIG_AUX_DIR([build-aux])

diff --git a/src/libostree/libostree-devel.sym b/src/libostree/libostree-devel.sym
index 226b2ead9d3bcb8c43e1cc3e02948e3a33a8f04f..46ad280cf56670c03f2a82f5833eb156d8f7a19f 100644 (file)
--- a/src/libostree/libostree-devel.sym
+++ b/src/libostree/libostree-devel.sym
@@ -18,14 +18,6 @@
 ***/
 
 /* Add new symbols here.  Release commits should copy this section into -released.sym. */
-LIBOSTREE_2018.5 {
-  ostree_sysroot_stage_tree;
-  ostree_sysroot_get_staged_deployment;
-  ostree_deployment_is_staged;
-  ostree_repo_traverse_new_parents;
-  ostree_repo_traverse_parents_get_commits;
-  ostree_repo_traverse_commit_union_with_parents;
-} LIBOSTREE_2018.3;
 
 /* Stub section for the stable release *after* this development one; don't
  * edit this other than to update the last number.  This is just a copy/paste

diff --git a/src/libostree/libostree-released.sym b/src/libostree/libostree-released.sym
index e9a95cc7e6098be486a9d2a58c7afbc1645d47b0..533bc5c2fa2787c42a5c51c805c6096c5520ae91 100644 (file)
--- a/src/libostree/libostree-released.sym
+++ b/src/libostree/libostree-released.sym
@@ -464,6 +464,15 @@ LIBOSTREE_2018.3 {
   ostree_deployment_is_pinned;
 } LIBOSTREE_2018.2;
 
+LIBOSTREE_2018.5 {
+  ostree_sysroot_stage_tree;
+  ostree_sysroot_get_staged_deployment;
+  ostree_deployment_is_staged;
+  ostree_repo_traverse_new_parents;
+  ostree_repo_traverse_parents_get_commits;
+  ostree_repo_traverse_commit_union_with_parents;
+} LIBOSTREE_2018.3;
+
 /* NOTE: Only add more content here in release commits!  See the
  * comments at the top of this file.
  */

diff --git a/tests/test-symbols.sh b/tests/test-symbols.sh
index 13b47afbf70f307b407778b2abe9fe0c2082b28f..501bedeb54d29e444785fd83bf7472271e98ded2 100755 (executable)
--- a/tests/test-symbols.sh
+++ b/tests/test-symbols.sh
@@ -54,7 +54,7 @@ echo 'ok documented symbols'
 
 # ONLY update this checksum in release commits!
 cat > released-sha256.txt <<EOF
-d77bacdfe04f2a150e4d5e1637410e851c273b238468d820c0d2a168971900f3  ${released_syms}
+60c9d53a0ab64f018ad51d835caf7aae27a3d50918ca8ac401fd49945ba636cc  ${released_syms}
 EOF
 sha256sum -c released-sha256.txt